Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 12 Jul 2009 12:48:39 +0000 (14:48 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 12 Jul 2009 12:48:39 +0000 (14:48 +0200)
commit13e4537e472c492ae26913de2302f977cd5f2169
treef9fe92d8e870dc326eab98df4c316868acc4cb69
parentbfacd5adaab3b70c2820863dd3a9673356cd3d44
parent2235f4d6bd38ddff78a986d8461edaaac7e02d1d
Merge branch 'upstream'